Auto merge of #1995 - alexcrichton:less-recursion, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 21 Sep 2015 19:58:13 +0000 (19:58 +0000)
committerbors <bors@rust-lang.org>
Mon, 21 Sep 2015 19:58:13 +0000 (19:58 +0000)
A few final nits and such taken care of, attempting to land now!


Trivial merge